Reviewing files that changed from the base of the PR and between a1dfd59 and e5c5e15.

• Cargo.lock is excluded by !**/*.lock
• test-integration/Cargo.lock is excluded by !**/*.lock

• Cargo.toml (1 hunks)
• magicblock-accounts/src/scheduled_commits_processor.rs (3 hunks)
• magicblock-committor-service/src/tasks/args_task.rs (6 hunks)
• magicblock-committor-service/src/tasks/mod.rs (1 hunks)
• magicblock-committor-service/src/tasks/task_builder.rs (3 hunks)
• magicblock-committor-service/src/tasks/task_visitors/persistor_visitor.rs (1 hunks)
• magicblock-magic-program-api/src/instruction.rs (1 hunks)
• magicblock-rpc-client/src/lib.rs (1 hunks)
• programs/magicblock/src/magic_scheduled_base_intent.rs (7 hunks)
• programs/magicblock/src/magicblock_processor.rs (4 hunks)
• programs/magicblock/src/schedule_transactions/process_schedule_commit.rs (2 hunks)
• programs/magicblock/src/schedule_transactions/process_scheduled_commit_sent.rs (5 hunks)
• test-integration/Cargo.toml (2 hunks)
• test-integration/programs/schedulecommit-security/src/lib.rs (2 hunks)
• test-integration/programs/schedulecommit/src/api.rs (5 hunks)
• test-integration/programs/schedulecommit/src/lib.rs (9 hunks)
• test-integration/programs/schedulecommit/src/order_book.rs (1 hunks)
• test-integration/programs/schedulecommit/src/utils/mod.rs (3 hunks)
• test-integration/schedulecommit/client/src/schedule_commit_context.rs (6 hunks)
• test-integration/schedulecommit/client/src/verify.rs (2 hunks)
• test-integration/schedulecommit/test-scenarios/Cargo.toml (1 hunks)
• test-integration/schedulecommit/test-scenarios/tests/01_commits.rs (2 hunks)
• test-integration/schedulecommit/test-scenarios/tests/02_commit_and_undelegate.rs (4 hunks)
• test-integration/schedulecommit/test-scenarios/tests/03_commits_fee_payer.rs (1 hunks)
• test-integration/schedulecommit/test-scenarios/tests/utils/mod.rs (1 hunks)
• test-integration/test-ledger-restore/tests/08_commit_update.rs (2 hunks)
• test-integration/test-tools/src/integration_test_context.rs (2 hunks)
• test-integration/test-tools/src/scheduled_commits.rs (3 hunks)

• GitHub Check: run_make_ci_format
• GitHub Check: run_make_ci_test
• GitHub Check: run_make_ci_lint
• GitHub Check: run_make_ci_test

test-integration/test-ledger-restore/tests/08_commit_update.rs (1)

55-55: LGTM! Correctly updated to match new function signature.

Both call sites properly destructure the new 3-tuple return value. The _tmpdir binding is necessary to keep the TempDir alive throughout the function scope, preventing premature cleanup of the temporary directory while the validator is still using it.

Also applies to: 170-170

test-integration/programs/schedulecommit/src/utils/mod.rs (2)

53-53: LGTM: Type alignment with Solana API.

Changing size to u64 aligns with Solana's system_instruction::allocate API, which expects a u64 parameter. This improves type consistency and eliminates the need for type conversions downstream.

---

70-90: LGTM: Clean implementation with helpful debugging.

The changes correctly handle the type conversion:

• Line 71: The cast to usize is necessary for Rent::minimum_balance and is safe given Solana's practical account size limits.
• Lines 75-80: The debug log provides useful visibility into lamport requirements during account allocation.
• Line 90: Passing size directly as u64 to system_instruction::allocate is cleaner and aligns with the API signature.

test-integration/programs/schedulecommit-security/src/lib.rs (2)

2-2: LGTM: Import addition is correct.

The CommitPolicy import is necessary for the API change on line 149.

---

143-150: No action required—the two CPI paths use intentionally different APIs.

The review comment's concern about consistency is based on a false premise. The code uses two fundamentally different functions from different modules:

• Path 1 (schedule_commit_cpi_instruction): A local program API wrapper with a fixed, simplified interface
• Path 2 (create_schedule_commit_ix): An external SDK function with extended configuration options including CommitPolicy

These are not parallel implementations requiring symmetry. The schedule_commit_cpi_instruction function does not support CommitPolicy by design—it wraps commit scheduling with hardcoded policy defaults. Adding CommitPolicy::UseFullBytes to create_schedule_commit_ix is the correct change and requires no corresponding update to schedule_commit_cpi_instruction.

Likely an incorrect or invalid review comment.

test-integration/test-tools/src/integration_test_context.rs (1)

167-171: Transaction version configuration is correct and environment-aware.

The conditional logic properly handles two distinct RPC endpoints:

• Chain (Solana devnet): max_supported_transaction_version: Some(0) with 50 retries to handle devnet's known quirk of sometimes returning version responses instead of transaction metadata (noted at line 160-161).
• Ephemeral (local validator): None to use default behavior on a controlled, local environment without such quirks.

Git history confirms this change is part of the current PR (commit 4c75d78). The code is correctly differentiated for each environment. No changes needed.

test-integration/test-tools/src/scheduled_commits.rs (1)

182-213: LGTM! Clear hierarchical naming for log variables.

The renaming from ephem_logs/chain_logs to ephem_logs_l1/ephem_logs_l2 improves clarity by establishing a consistent naming convention that reflects the two-level log retrieval hierarchy.

magicblock-committor-service/src/tasks/task_visitors/persistor_visitor.rs (1)

29-33: LGTM: CommitDiff included in strategy persistence.

Cleanly broadens Commit to CommitDiff without changing strategy semantics.

programs/magicblock/src/schedule_transactions/process_schedule_commit.rs (2)

224-230: Diff-aware commit routing is correct; keep logs concise.

Choosing StandaloneDiff when request_diff is true is right. Consider demoting the "StandaloneDiff" ic_msg to debug in production builds to reduce log noise.

Also applies to: 233-238

---

29-32: All call sites properly initialize request_diff—no corrections needed.

Verification confirms that every process_schedule_commit() invocation explicitly sets both request_undelegation and request_diff fields. All three instruction paths (ScheduleCommit, ScheduleCommitAndUndelegate, ScheduleCommitDiffAndUndelegate) pass values for request_diff, with ScheduleCommitDiffAndUndelegate correctly setting it to true to trigger the CommitType::StandaloneDiff path. No uninitialized defaults are used, and no silent routing to full-state commits can occur.

programs/magicblock/src/schedule_transactions/process_scheduled_commit_sent.rs (1)

29-30: LGTM: commit_diff added end-to-end with safe logging.

Field is carried into printable form and logged only as a flag. Tests initialize the new field.

Also applies to: 44-45, 71-73, 215-217, 254-255

magicblock-committor-service/src/tasks/args_task.rs (1)

197-205: Calibrate compute units for CommitDiff based on diff size.

Fixed 65_000 may be inaccurate. Once diff is precomputed, scale CU by diff length/segments or add headroom to avoid CU errors.

Based on learnings

programs/magicblock/src/magicblock_processor.rs (3)

2-2: LGTM: import added is correct.

---

51-54: ScheduleCommit: explicit request_diff=false is correct.

---

90-99: New ScheduleCommitDiffAndUndelegate path correctly flips request_diff=true.

magicblock-committor-service/src/tasks/task_builder.rs (1)

96-105: Per-account Commit vs CommitDiff task selection is correct.

programs/magicblock/src/magic_scheduled_base_intent.rs (6)

104-107: ScheduledBaseIntent::is_commit_diff added — OK.

---

155-164: MagicBaseIntent::is_commit_diff added — OK.

---

448-454: CommitType::is_commit_diff implementation — OK.

---

456-463: Getters updated for StandaloneDiff — OK.

Also applies to: 465-473

---

475-487: is_empty handles StandaloneDiff — OK.

---

317-323: StandaloneDiff variant already exists and is actively used in the codebase.

The review's concern assumes StandaloneDiff is a new addition that will shift bincode discriminants. However, the variant is already present in process_schedule_commit.rs (lines 225–226), indicating it exists before this PR or is not new.

If StandaloneDiff was already committed to the codebase:

• The bincode discriminant shift already happened (or never was a concern).
• The review comment's warning is outdated or misguided.

If the snippet shows the final state (post-changes) and StandaloneDiff was genuinely added in this PR:

• Verify the diff shows it was inserted between existing variants (which would shift discriminants).
• If it was appended after existing variants, discriminants remain stable and no migration is needed.

Critical finding: No backwards compatibility tests, no versioning code, and no serde external tagging exist. If persisted state truly exists and the variant order changed, this is a risk. However, the evidence suggests StandaloneDiff is not new.

Action for developer: Confirm in the PR diff that you are not reordering existing enum variants. If appending new variants after existing ones, bincode compatibility is safe. If inserting between existing variants, migration is required.

test-integration/schedulecommit/test-scenarios/Cargo.toml (1)

19-20: LGTM!

The addition of rand and borsh as workspace dev-dependencies appropriately supports the new order-book test scenarios introduced in this PR.

test-integration/schedulecommit/test-scenarios/tests/01_commits.rs (1)

30-31: LGTM!

The addition of deterministic seed b"magic_schedule_commit" improves test reproducibility by ensuring consistent PDA derivation across test runs.

test-integration/schedulecommit/test-scenarios/tests/utils/mod.rs (2)

16-35: LGTM!

The seed parameter enables deterministic test context initialization, and explicitly driving the init_committees and delegate_committees workflow steps with debug logging improves test clarity and observability.

---

41-47: LGTM!

Making assert_one_committee_was_committed generic over type T with appropriate trait bounds enables reuse across different account types (MainAccount, OrderBookOwned, etc.) while maintaining type safety.

test-integration/schedulecommit/test-scenarios/tests/03_commits_fee_payer.rs (2)

23-80: LGTM!

The test properly validates that attempting to commit a fee payer without escrowing lamports fails with the expected "DoesNotHaveEscrowAccount" error. The test structure and assertions are appropriate.

---

83-135: LGTM!

The test correctly validates the happy path where fee payer commits succeed when lamports are properly escrowed. The verification flow and assertions comprehensively check that both committees and the fee payer were committed and synchronized.

test-integration/schedulecommit/test-scenarios/tests/02_commit_and_undelegate.rs (3)

55-56: LGTM!

The addition of deterministic seed b"magic_schedule_commit" ensures reproducible test behavior across runs.

---

110-164: LGTM!

The commit_and_undelegate_order_book_account helper follows the established pattern of other commit helpers in this file, properly constructing the update and schedule-commit-diff instructions sequence.

---

244-312: Excellent reproducibility design for randomized testing.

The test demonstrates best practices for randomized testing:

• Prints the RNG seed for reproducibility
• Includes the seed in assertion failure messages
• Uses seeded RNG (StdRng) for deterministic behavior given a seed

This allows failures to be reproduced by rerunning with the printed seed value.

One optional enhancement: consider adding a way to override the seed via environment variable for easier failure reproduction:

let rng_seed = std::env::var("TEST_RNG_SEED")
    .ok()
    .and_then(|s| s.parse::<u64>().ok())
    .unwrap_or_else(|| OsRng.next_u64());

test-integration/programs/schedulecommit/src/lib.rs (1)

561-571: Use commit_diff for undelegate path; this looks correct.

The diff-based commit is invoked when undelegate is true; good alignment with the new optimization.

Please confirm tests cover both diff and full-commit paths (with/without undelegate).

test-integration/programs/schedulecommit/src/order_book.rs (1)

101-116: Bounds/capacity logic is good; but relies on header being valid.

Once header init is fixed in process_init_order_book, these helpers are fine for basic growth semantics.

Ensure tests cover:

• Non-zero existing asks/bids followed by additional inserts (to exercise prefix/suffix behavior).
• Capacity exhaustion returning None.

Also applies to: 118-138, 163-184

test-integration/schedulecommit/client/src/schedule_commit_context.rs (1)

260-267: Seed semantics are correct and consistently applied across the codebase.

The verification shows that delegate_account_cpi_instruction() explicitly branches on two supported canonical seeds:

• b"magic_schedule_commit" → ScheduleCommitInstruction::DelegateCpi
• b"order_book" → ScheduleCommitInstruction::DelegateOrderBook

All test utilities and callers supply only these supported seeds. The delegate_committees() function at lines 260-267 correctly passes &self.user_seed, and all constructors receive only canonical seeds from test callers. PDA derivation and instruction creation use consistent seed semantics.

Reviewing files that changed from the base of the PR and between e5c5e15 and 693af7f.

• Cargo.lock is excluded by !**/*.lock
• test-integration/Cargo.lock is excluded by !**/*.lock

• Cargo.toml (1 hunks)
• magicblock-accounts/src/scheduled_commits_processor.rs (3 hunks)
• magicblock-committor-service/src/tasks/args_task.rs (6 hunks)
• magicblock-committor-service/src/tasks/mod.rs (1 hunks)
• magicblock-committor-service/src/tasks/task_builder.rs (3 hunks)
• magicblock-committor-service/src/tasks/task_visitors/persistor_visitor.rs (1 hunks)
• magicblock-magic-program-api/src/instruction.rs (1 hunks)
• magicblock-rpc-client/src/lib.rs (1 hunks)
• programs/magicblock/src/magic_scheduled_base_intent.rs (7 hunks)
• programs/magicblock/src/magicblock_processor.rs (4 hunks)
• programs/magicblock/src/schedule_transactions/process_schedule_commit.rs (2 hunks)
• programs/magicblock/src/schedule_transactions/process_scheduled_commit_sent.rs (5 hunks)
• test-integration/Cargo.toml (2 hunks)
• test-integration/programs/schedulecommit-security/src/lib.rs (2 hunks)
• test-integration/programs/schedulecommit/src/api.rs (5 hunks)
• test-integration/programs/schedulecommit/src/lib.rs (9 hunks)
• test-integration/programs/schedulecommit/src/order_book.rs (1 hunks)
• test-integration/programs/schedulecommit/src/utils/mod.rs (3 hunks)
• test-integration/schedulecommit/client/src/schedule_commit_context.rs (6 hunks)
• test-integration/schedulecommit/client/src/verify.rs (2 hunks)
• test-integration/schedulecommit/test-scenarios/Cargo.toml (1 hunks)
• test-integration/schedulecommit/test-scenarios/tests/01_commits.rs (2 hunks)
• test-integration/schedulecommit/test-scenarios/tests/02_commit_and_undelegate.rs (4 hunks)
• test-integration/schedulecommit/test-scenarios/tests/03_commits_fee_payer.rs (1 hunks)
• test-integration/schedulecommit/test-scenarios/tests/utils/mod.rs (1 hunks)
• test-integration/test-ledger-restore/tests/08_commit_update.rs (2 hunks)
• test-integration/test-tools/src/integration_test_context.rs (2 hunks)
• test-integration/test-tools/src/scheduled_commits.rs (3 hunks)

• GitHub Check: run_make_ci_test
• GitHub Check: run_make_ci_lint
• GitHub Check: run_make_ci_test

test-integration/programs/schedulecommit/src/utils/mod.rs (3)

49-55: LGTM: Type alignment with Solana API.

Changing size from usize to u64 correctly aligns with Solana's system_instruction::allocate signature, which expects space: u64.

---

75-79: LGTM: Helpful debug logging.

The added logging for lamport requirements and payer balance aids in troubleshooting account allocation issues during testing.

---

90-90: Critical fix: Correct system_instruction::allocate signature.

The updated call now correctly provides both required arguments (pubkey and space) to system_instruction::allocate. The previous implementation appears to have been missing the pubkey argument, which would not match the function signature: pub fn allocate(pubkey: &Pubkey, space: u64) -> Instruction.

test-integration/test-tools/src/scheduled_commits.rs (1)

182-213: Variable renaming improves clarity.

The renaming of log variables to ephem_logs_l1 and ephem_logs_l2 clearly distinguishes the two-level log fetching process, and the updated error context at line 206 now correctly references the first-level logs. These changes enhance code readability.

test-integration/programs/schedulecommit-security/src/lib.rs (2)

2-2: LGTM!

The CommitPolicy import is correctly added to support the new argument at line 149.

---

143-150: Ignore this review comment. The original comment incorrectly assumes that schedule_commit_cpi_instruction and create_schedule_commit_ix should be consistent, but they are two distinct functions from different crates with different purposes:

• schedule_commit_cpi_instruction (from program_schedulecommit::api) is a local CPI helper that does not accept a CommitPolicy parameter
• create_schedule_commit_ix (from ephemeral_rollups_sdk::ephem) is an SDK function that accepts CommitPolicy as a parameter

The two functions have intentionally different signatures. There is no test inconsistency to address.

Likely an incorrect or invalid review comment.

test-integration/test-ledger-restore/tests/08_commit_update.rs (1)

55-61: No issues found—code is correct as written.

The TempDir returned by setup_validator_with_local_remote is created specifically for temporary config storage during validator initialization (written in start_magicblock_validator_with_config_struct at line 225: fs::write(&config_path, config_toml)). After the validator process is spawned, this directory is no longer needed and is safely dropped. The actual ledger directory is managed separately by the main _tmpdir at line 42 of the test, which persists for the entire test duration. The binding to _tmpdir with an underscore prefix correctly signals that this return value is intentionally unused beyond validator initialization.

test-integration/programs/schedulecommit/src/api.rs (3)

36-54: LGTM!

The init_order_book_instruction follows the standard instruction builder pattern with appropriate account metadata.

---

56-75: LGTM!

The grow_order_book_instruction correctly constructs the instruction with the additional_space parameter.

---

175-212: LGTM!

Both update_order_book_instruction and schedule_commit_diff_instruction_for_order_book follow correct instruction builder patterns with appropriate account metadata.

test-integration/schedulecommit/test-scenarios/tests/01_commits.rs (1)

30-31: LGTM! Deterministic seed ensures reproducible test contexts.

The hard-coded seed b"magic_schedule_commit" provides deterministic PDA derivation and context initialization, which improves test reliability and debugging.

Also applies to: 84-85

test-integration/schedulecommit/test-scenarios/tests/03_commits_fee_payer.rs (2)

82-135: LGTM! Fee payer escrow test properly verifies expected behavior.

The test correctly verifies that with proper escrow setup, the fee payer commit succeeds and all expected assertions pass.

---

34-41: Fix struct field destructuring: payer_ephem field and ephem_blockhash retrieval.

The code attempts to destructure non-existent struct fields:

• Line 35: payer field doesn't exist in ScheduleCommitTestContextFields — should be payer_ephem: payer
• Line 39: ephem_blockhash is not a struct field — must be fetched separately via ephem_client.get_latest_blockhash().unwrap()
• Lines 58, 112: Remove dereference (*) from ephem_blockhash once corrected

See 01_commits.rs (lines 34, 54) for the correct pattern.

Also applies to: 88-95, 112

⛔ Skipped due to learnings

Learnt from: bmuddha
Repo: magicblock-labs/magicblock-validator PR: 578
File: magicblock-aperture/src/requests/websocket/account_subscribe.rs:18-27
Timestamp: 2025-10-21T14:00:54.642Z
Learning: In magicblock-aperture account_subscribe handler (src/requests/websocket/account_subscribe.rs), the RpcAccountInfoConfig fields data_slice, commitment, and min_context_slot are currently ignored—only encoding is applied. This is tracked as technical debt in issue #579: https://github.com/magicblock-labs/magicblock-validator/issues/579

programs/magicblock/src/magic_scheduled_base_intent.rs (3)

104-106: LGTM!

The is_commit_diff() method correctly delegates to the base intent, following the same pattern as the existing is_undelegate() method.

---

155-163: LGTM!

The is_commit_diff() method correctly handles all MagicBaseIntent variants, properly delegating to the underlying CommitType for both Commit and CommitAndUndelegate cases.

---

458-458: LGTM!

The accessor methods correctly handle the new StandaloneDiff variant, treating it identically to Standalone since both contain Vec<CommittedAccount>.

Also applies to: 468-468, 480-482

magicblock-committor-service/src/tasks/task_visitors/persistor_visitor.rs (2)

29-33: LGTM!

The match correctly handles both Commit and CommitDiff variants identically, as both contain CommitTask and should be persisted the same way.

---

59-59: ****

The review comment is incorrect. BufferTaskType intentionally has only a single Commit variant because it represents buffer-based commit operations. CommitDiff is a separate task variant that belongs exclusively to ArgsTaskType and is handled through a different code path.

Evidence:

• ArgsTaskType includes CommitDiff(CommitTask), but BufferTaskType does not
• ArgsTaskType::CommitDiff explicitly panics with "ArgsTaskType::CommitDiff not handled" when attempting conversion, indicating CommitDiff is intentionally not converted to BufferTask
• The refutable pattern at line 59 is safe because BufferTaskType can only ever contain a single variant

No code changes are needed; the refutable pattern is correct as implemented.

Likely an incorrect or invalid review comment.

programs/magicblock/src/schedule_transactions/process_schedule_commit.rs (2)

31-31: LGTM!

The request_diff field addition cleanly extends the options structure to control diff-based commit scheduling.

---

231-238: LGTM!

The commit_action is correctly used in both the undelegation and non-undelegation paths, enabling diff-based commits for both scenarios while preserving existing semantics.

Reviewing files that changed from the base of the PR and between 693af7f and 99f2e8f.

• Cargo.lock is excluded by !**/*.lock
• test-integration/Cargo.lock is excluded by !**/*.lock

• magicblock-committor-service/src/tasks/args_task.rs (6 hunks)
• programs/magicblock/src/magic_scheduled_base_intent.rs (7 hunks)
• programs/magicblock/src/magicblock_processor.rs (2 hunks)
• programs/magicblock/src/schedule_transactions/process_schedule_commit.rs (2 hunks)
• test-integration/Cargo.toml (4 hunks)
• test-integration/programs/schedulecommit/Cargo.toml (1 hunks)
• test-integration/programs/schedulecommit/src/lib.rs (9 hunks)
• test-integration/programs/schedulecommit/src/order_book.rs (1 hunks)

test-integration/Cargo.toml (1)

72-72: Now let me check the codebase for actual usage of these dependencies to confirm they are necessary:

Based on my verification, I can now generate the rewritten review comment:

---

Both dependencies are compatible with Solana 2.2 and appropriate for this PR.

rkyv 0.7.45 supports no_std and no_alloc configurations, making it suitable for Solana on-chain programs. It supports no-std builds for targets without a standard library and no-alloc builds for targets where allocations cannot be made. The Solana VM guarantees that account data is byte-aligned to a multiple of 8, which enables rkyv's zero-copy deserialization to function safely on account data. static_assertions 1.1.0 is a stable, widely-adopted crate (225,914,390 downloads all time) providing compile-time assertion macros useful for validating account structure layouts and sizes—a common pattern in Solana programs.

No further verification needed.

test-integration/programs/schedulecommit/Cargo.toml (1)

11-12: LGTM! Dependencies properly support order book implementation.

The additions of rkyv and static_assertions are well-utilized in order_book.rs for alignment guarantees and compile-time size/alignment checks.

programs/magicblock/src/schedule_transactions/process_schedule_commit.rs (1)

31-31: LGTM! New field enables diff-based commit path.

The request_diff flag properly controls whether to use CommitType::StandaloneDiff or CommitType::Standalone, enabling the optimization for large accounts with small changes.

programs/magicblock/src/magicblock_processor.rs (2)

44-59: LGTM! Existing instructions properly default to non-diff path.

Both ScheduleCommit and ScheduleCommitAndUndelegate correctly set request_diff: false to maintain existing behavior.

---

85-92: LGTM! New instruction variant correctly enables diff-based commit with undelegation.

The ScheduleCommitDiffAndUndelegate instruction properly sets both request_undelegation: true and request_diff: true, mirroring ScheduleCommitAndUndelegate behavior while enabling the diff optimization.

test-integration/programs/schedulecommit/src/order_book.rs (1)

48-75: LGTM! Mutable aliasing UB resolved with aligned copy.

The implementation now safely copies the input buffer into rkyv::AlignedVec before creating mutable references, avoiding the undefined behavior from the previous approach. The comment clearly explains the rationale.

magicblock-committor-service/src/tasks/args_task.rs (2)

171-172: LGTM! CommitDiff correctly returns Err(self) in optimize().

Returning Err(self) for CommitDiff is correct since the diff is already optimized by design—it sends only the differences rather than full account data. Converting to BufferTask would be counterproductive.

Per previous discussion, this is the correct semantic since CommitDiff is already using the most efficient data transfer strategy.

---

196-203: LGTM! Compute units appropriately set for CommitDiff.

The 65,000 compute units for CommitDiff (vs 70,000 for Commit) reflects the reduced work from transmitting only the diff. This aligns with the test observation showing lower CU usage.

Based on learnings: these are compute units per task, and transactions may comprise multiple tasks.

test-integration/programs/schedulecommit/src/lib.rs (3)

203-203: LGTM! Type change to u64 is appropriate.

Changing MainAccount::SIZE from usize to u64 aligns with the size parameter type in allocate_account_and_assign_owner (line 255) and Solana's account size conventions.

---

398-414: LGTM! Log message and signer check are correct.

Line 402 now uses the accurate log message "Update orderbook", and line 407 properly validates that the payer is a signer before allowing the update.

---

419-439: LGTM! Handler correctly uses diff-based commit with undelegation.

The implementation properly:

• Returns NotEnoughAccountKeys when accounts are missing (line 426)
• Validates payer is a signer (line 429)
• Invokes commit_diff_and_undelegate_accounts for the optimized diff path (line 431)

Reviewing files that changed from the base of the PR and between 99f2e8f and 7eaaa13.

• Cargo.lock is excluded by !**/*.lock
• test-integration/Cargo.lock is excluded by !**/*.lock

• magicblock-committor-service/src/tasks/args_task.rs (6 hunks)
• programs/magicblock/src/magic_scheduled_base_intent.rs (7 hunks)
• programs/magicblock/src/magicblock_processor.rs (2 hunks)
• programs/magicblock/src/schedule_transactions/process_schedule_commit.rs (2 hunks)
• test-integration/Cargo.toml (4 hunks)
• test-integration/programs/schedulecommit/Cargo.toml (1 hunks)
• test-integration/programs/schedulecommit/src/lib.rs (9 hunks)
• test-integration/programs/schedulecommit/src/order_book.rs (1 hunks)

• GitHub Check: run_make_ci_format
• GitHub Check: run_make_ci_test
• GitHub Check: run_make_ci_test

programs/magicblock/src/schedule_transactions/process_schedule_commit.rs (1)

29-32: Field addition looks correct.

The new request_diff field is properly scoped as pub(crate) and the Default trait will initialize it to false, maintaining backward compatibility.

programs/magicblock/src/magicblock_processor.rs (2)

44-51: ScheduleCommit handler correctly configured.

The handler properly sets request_diff: false to maintain the existing full-commit behavior for standard commits.

---

85-92: New instruction handler correctly implemented.

The ScheduleCommitDiffAndUndelegate handler properly enables both undelegation and diff-based commits by setting both flags to true. The implementation follows the established pattern from the other handlers.

programs/magicblock/src/magic_scheduled_base_intent.rs (4)

104-106: Delegation method correctly implemented.

The is_commit_diff() method appropriately delegates to the underlying base_intent, following the established pattern for other query methods in this struct.

---

155-163: Commit diff detection logic is correct.

The method correctly returns false for BaseActions and properly delegates to the commit-related variants to determine if differential commits are enabled.

---

317-327: StandaloneDiff variant added correctly.

The new variant follows the same structure as Standalone, holding Vec<CommittedAccount>. Note that full account data is stored here; the actual diff computation likely occurs downstream during commit processing.

---

448-484: Accessor methods properly handle StandaloneDiff.

All match expressions are now exhaustive and correctly handle the new StandaloneDiff variant. The is_commit_diff() method correctly returns true only for StandaloneDiff, and the accessor methods treat it consistently with Standalone.

magicblock-committor-service/src/tasks/args_task.rs (4)

1-24: LGTM: Imports support the CommitDiff feature.

All new imports are necessary for the RPC client setup, diff computation, and configuration.

---

30-30: LGTM: CommitDiff variant added.

Reusing CommitTask for the CommitDiff variant is appropriate since they share the same data requirements.

---

171-172: LGTM: Returning Err(self) for CommitDiff is correct.

The past review discussion thoroughly analyzed this and concluded that CommitDiff should return Err(self) (no optimization) because:

• CommitDiff is already optimized by design—it transmits only the diff (e.g., 286 bytes) vs. full account data (10,240 bytes per your test)
• Converting CommitDiff to BufferTask would be counterproductive and defeat its purpose
• Err(self) correctly signals "no further optimization possible"

Suggestion: The TODO on line 171 can be resolved and removed based on the past review's analysis.

---

199-199: LGTM: Compute units appropriately reduced for CommitDiff.

The 65,000 compute unit allocation (5k less than Commit's 70k) aligns with your test observations and reflects the reduced data processing for diff-based commits.

test-integration/programs/schedulecommit/src/lib.rs (1)

419-439: LGTM—signer validation and error handling are now correct.

The function now properly returns NotEnoughAccountKeys when the accounts array doesn't match, and validates that payer is a signer before proceeding with the CPI call.

test-integration/programs/schedulecommit/Cargo.toml (1)

11-12: LGTM—dependencies appropriately support zero-copy OrderBook.

The rkyv crate provides AlignedVec for safe buffer allocation, and static_assertions enables compile-time layout verification. Both are correctly utilized in order_book.rs.

test-integration/Cargo.toml (1)

72-72: LGTM—workspace dependencies properly declared.

The rkyv and static_assertions crates are correctly added at the workspace level, enabling their use across integration test crates for zero-copy structures and compile-time assertions.

Also applies to: 91-91

Reviewing files that changed from the base of the PR and between 45d5b50 and 4a5d8e2.

• test-integration/schedulecommit/client/src/schedule_commit_context.rs (6 hunks)
• test-integration/schedulecommit/test-security/tests/01_invocations.rs (1 hunks)
• test-integration/test-committor-service/tests/common.rs (2 hunks)
• test-integration/test-committor-service/tests/test_transaction_preparator.rs (3 hunks)
• test-integration/test-tools/src/integration_test_context.rs (2 hunks)

• GitHub Check: run_make_ci_lint
• GitHub Check: run_make_ci_test
• GitHub Check: Build Project

test-integration/test-tools/src/integration_test_context.rs (1)

157-159: LGTM! Format placeholder bug fixed.

The panic message now correctly includes the label parameter, addressing the previous review comment. The error will properly indicate which rpc_client is missing.

test-integration/schedulecommit/client/src/schedule_commit_context.rs (3)

66-80: LGTM: Constructor API properly updated for user_seed support.

The constructor signatures are consistently updated to accept user_seed parameter, which is necessary for supporting different commit paths (standard vs. OrderBook). The breaking API change aligns with the PR objectives.

---

170-211: LGTM: Seed-based branching and error handling are well-implemented.

The match expression correctly handles both supported seeds (magic_schedule_commit and order_book) and provides a clear error message for unsupported seeds. The branching logic appropriately calls the corresponding initialization instructions for each path.

---

268-277: LGTM: user_seed correctly propagated to delegation instruction.

The user_seed is properly passed to delegate_account_cpi_instruction, ensuring consistent PDA derivation throughout the delegation flow.

test-integration/schedulecommit/test-security/tests/01_invocations.rs (1)

28-42: LGTM: Test helper correctly updated for new API.

The prepare_ctx_with_account_to_commit helper properly passes b"magic_schedule_commit" to both try_new and try_new_random_keys, which is appropriate for these security-focused invocation tests. The API migration is consistent and correct.

test-integration/test-committor-service/tests/test_transaction_preparator.rs (1)

38-42: LGTM! Consistent adoption of the new CommitTask::new() API.

All test cases have been correctly updated to use CommitTask::new() instead of direct struct construction. The argument order (commit_id, allow_undelegation, committed_account) is consistent across all call sites, and the tests correctly wrap CommitTask in either ArgsTask or BufferTask as appropriate.

Also applies to: 92-95, 99-103, 186-189

test-integration/test-committor-service/tests/common.rs (1)

150-166: The RPC client creation and network call in CommitTask::new() are correctly implemented, but the helper function doesn't exercise the CommitDiff optimization path.

The change correctly adopts the new CommitTask::new() API. However, there are two concerns worth verifying:

1. RPC call behavior: CommitTask::new() creates an RpcClient pointing to localhost:7799 and synchronously calls get_account() for accounts larger than 200 bytes (lines 138–144 in magicblock-committor-service/src/tasks/mod.rs). Since create_commit_task() uses Pubkey::new_unique(), these accounts don't exist on-chain, so the fetch will always return None and fetched_account will never be populated.

2. CommitDiff not exercised: The is_commit_diff() method (line 158 in mod.rs) returns true only when both data > 200 bytes AND fetched_account.is_some(). With this helper, the second condition is never met, so tests using create_commit_task() won't exercise the CommitDiff optimization path.

Other tests in the suite (e.g., test_ix_commit_local.rs) use different account creation patterns with various sizes (100 bytes, 800 bytes, 1KB, 10KB). Verify that those tests properly set up on-chain accounts so the CommitDiff path is tested elsewhere.

Reviewing files that changed from the base of the PR and between 4a5d8e2 and 0ac18ab.

• magicblock-committor-service/src/tasks/mod.rs (10 hunks)
• test-integration/test-committor-service/tests/test_delivery_preparator.rs (4 hunks)

• GitHub Check: run_make_ci_test
• GitHub Check: Build Project

Reviewing files that changed from the base of the PR and between 0ac18ab and a30f507.

• magicblock-committor-service/src/tasks/mod.rs (10 hunks)
• test-integration/test-committor-service/tests/test_delivery_preparator.rs (4 hunks)

• GitHub Check: Build Project
• GitHub Check: run_make_ci_lint
• GitHub Check: run_make_ci_test

test-integration/test-committor-service/tests/test_delivery_preparator.rs (1)

19-19: Clarify the multi-threading test strategy.

The test suite shows inconsistent use of the multi-thread tokio runtime:

• Lines 19, 213, 295: Multi-thread flavor with 2 workers
• Lines 83, 162: Single-thread (default)

Since these appear to be sequential integration tests rather than concurrency tests, please clarify:

1. Is multi-threading intended to test thread-safety of the code under test?
2. Should the threading model be consistent across all tests?
3. Are there specific tests that require multi-threading while others don't?

If multi-threading is not necessary for these tests, consider using the default single-threaded runtime for simplicity and determinism.

Also applies to: 83-83, 213-213, 295-295

Reviewing files that changed from the base of the PR and between a30f507 and 33fe0bc.

• Cargo.lock is excluded by !**/*.lock
• test-integration/Cargo.lock is excluded by !**/*.lock

• Cargo.toml (1 hunks)
• magicblock-committor-service/src/tasks/args_task.rs (3 hunks)
• magicblock-committor-service/src/tasks/mod.rs (10 hunks)
• magicblock-committor-service/src/tasks/task_builder.rs (1 hunks)
• magicblock-committor-service/src/tasks/task_strategist.rs (4 hunks)
• programs/magicblock/src/magic_scheduled_base_intent.rs (1 hunks)
• test-integration/Cargo.toml (4 hunks)
• test-integration/programs/schedulecommit/Cargo.toml (1 hunks)
• test-integration/programs/schedulecommit/src/api.rs (5 hunks)
• test-integration/programs/schedulecommit/src/lib.rs (8 hunks)
• test-integration/programs/schedulecommit/src/order_book.rs (1 hunks)
• test-integration/programs/schedulecommit/src/utils/mod.rs (3 hunks)
• test-integration/schedulecommit/client/src/schedule_commit_context.rs (6 hunks)
• test-integration/schedulecommit/client/src/verify.rs (2 hunks)
• test-integration/schedulecommit/test-scenarios/Cargo.toml (1 hunks)
• test-integration/schedulecommit/test-scenarios/tests/01_commits.rs (2 hunks)
• test-integration/schedulecommit/test-scenarios/tests/02_commit_and_undelegate.rs (4 hunks)
• test-integration/schedulecommit/test-scenarios/tests/utils/mod.rs (1 hunks)
• test-integration/schedulecommit/test-security/tests/01_invocations.rs (1 hunks)
• test-integration/test-committor-service/tests/common.rs (2 hunks)
• test-integration/test-committor-service/tests/test_delivery_preparator.rs (4 hunks)
• test-integration/test-committor-service/tests/test_transaction_preparator.rs (3 hunks)
• test-integration/test-ledger-restore/tests/08_commit_update.rs (2 hunks)
• test-integration/test-tools/src/integration_test_context.rs (2 hunks)
• test-integration/test-tools/src/scheduled_commits.rs (3 hunks)

• GitHub Check: run_make_ci_test
• GitHub Check: run_make_ci_lint
• GitHub Check: Build Project

test-integration/test-tools/src/integration_test_context.rs (1)

157-159: LGTM! Format placeholder issue fixed.

The error message now correctly formats the label into the panic message using unwrap_or_else with a closure, resolving the previous issue where the placeholder [{}] would be printed literally.

test-integration/test-tools/src/scheduled_commits.rs (1)

182-236: LGTM! Clear two-stage log capture implementation.

The refactor to explicitly separate first-level and second-level ephemeral log fetches improves code clarity. The variable naming (ephem_logs_l1 and ephem_logs_l2) makes the staged nature of the log capture immediately apparent, and the error context at line 206 helpfully includes the first-level logs for debugging.

The logic flow is correct:

1. Fetch L1 logs from the initial signature and extract scheduled_commmit_sent_sig
2. Use that extracted signature to fetch L2 logs
3. Extract commit information from the L2 logs
4. Process included accounts and dump chain logs per signature

The dereference at line 234 (*sig) correctly handles the Copy trait on Signature.

test-integration/schedulecommit/test-scenarios/Cargo.toml (1)

19-20: LGTM!

Adding rand and borsh as dev-dependencies is appropriate for the expanded test scenarios involving OrderBook serialization and randomized test data generation.

test-integration/test-ledger-restore/tests/08_commit_update.rs (2)

55-61: LGTM!

Capturing _tmpdir extends the temporary directory's lifetime to match the test scope, preventing premature cleanup. This is a standard Rust RAII pattern.

---

170-176: LGTM!

Consistent with the pattern established in the write function, properly managing temporary directory lifetime.

programs/magicblock/src/magic_scheduled_base_intent.rs (1)

286-301: LGTM! Type definitions are well-formed.

The CommittedAccount struct and its From implementation correctly convert borrowed account data into an owned representation. The conversion properly handles the RefCell borrow and AccountSharedData → Account transformation.

Note: A previous review flagged that CommitType::StandaloneDiff is never constructed in try_from_args (lines 374-431). Since this file's diff doesn't show changes to try_from_args, verify separately that the construction logic has been updated to recognize CommitTypeArgs::StandaloneDiff and build the corresponding variant.

test-integration/programs/schedulecommit/src/utils/mod.rs (1)

75-79: LGTM! Helpful diagnostic logging.

The added logging provides useful visibility into lamport requirements and payer balance during account allocation.

Cargo.toml (1)

111-114: LGTM! Dependency update aligns with CommitDiff feature.

The delegation-program revision update to e8d03936 brings in the necessary support for the new CommitDiff functionality. The git-based dependency avoids the CI path issues noted in previous reviews.

test-integration/schedulecommit/test-scenarios/tests/01_commits.rs (2)

30-31: LGTM! Seed parameter enables deterministic testing.

Adding the user_seed parameter makes test setup reproducible, which is beneficial for debugging and test stability.

---

84-85: LGTM! Consistent seed usage across tests.

Using the same seed across test cases ensures consistent test behavior.

test-integration/schedulecommit/test-security/tests/01_invocations.rs (1)

29-36: LGTM! Seed parameter adds determinism to security tests.

The user_seed parameter makes these security test scenarios reproducible, which is especially valuable for regression testing and debugging security-related issues.

test-integration/test-committor-service/tests/common.rs (1)

152-165: LGTM! Constructor usage improves encapsulation.

Using CommitTask::new() instead of direct struct initialization is good practice. It centralizes construction logic and allows the constructor to handle internal branching (e.g., size-based threshold checks for CommitDiff vs CommitState).

test-integration/programs/schedulecommit/Cargo.toml (1)

11-12: LGTM! Dependencies added correctly for CommitDiff support.

The additions of rkyv and static_assertions are appropriate for zero-copy serialization and compile-time checks needed by the CommitDiff functionality.

magicblock-committor-service/src/tasks/args_task.rs (3)

1-1: LGTM! Import cleanup after refactoring.

Removing CommitStateArgs is correct since commit instruction creation is now delegated to CommitTask::create_commit_ix.

---

47-47: LGTM! Proper delegation to CommitTask.

Delegating instruction creation to value.create_commit_ix(validator) correctly enables the task to choose between CommitState and CommitDiff based on the commit type.

---

91-94: LGTM! Correct optimization guard for CommitDiff.

Returning Err(self) for CommitDiff is the right approach. As noted in past reviews, CommitDiff is already optimized by design (sends only the diff, not full state), so converting it to BufferTask would be counterproductive.

magicblock-committor-service/src/tasks/task_builder.rs (1)

92-96: LGTM! Clean refactoring to constructor-based API.

Replacing struct literal initialization with CommitTask::new(commit_id, allow_undelegation, account.clone()) is a good practice that encapsulates initialization logic and enables the task to determine the appropriate commit path internally.

magicblock-committor-service/src/tasks/task_strategist.rs (2)

161-161: TODO flags potential performance issue.

The TODO comment notes that heavy computations are being discarded. This is worth investigating for optimization—consider caching the transaction assembly result or restructuring to avoid repeated expensive calculations.

---

271-284: LGTM! Test helper correctly updated.

The test helper now uses CommitTask::new(...) instead of struct literals, aligning with the new constructor-based API.

test-integration/Cargo.toml (2)

60-62: LGTM! Delegation program dependency updated.

The revision update for magicblock-delegation-program to e8d03936 aligns with the CommitDiff feature implementation across the codebase.

---

74-74: LGTM! Dependencies added for CommitDiff support.

The additions of rkyv (0.7.45) for zero-copy serialization and static_assertions (1.1.0) for compile-time checks correctly support the CommitDiff feature.

Also applies to: 93-93

test-integration/schedulecommit/test-scenarios/tests/02_commit_and_undelegate.rs (1)

244-312: LGTM! Well-structured test with reproducible randomness.

The test correctly uses seeded randomness (OsRng + StdRng) for reproducibility and logs the seed in failure messages. The random order book generation and verification flow are sound.

test-integration/test-committor-service/tests/test_transaction_preparator.rs (1)

38-42: LGTM! Constructor migration applied consistently.

The updates correctly replace direct struct initialization with CommitTask::new(commit_id, allow_undelegation, committed_account) across all test scenarios. The API usage is consistent and correct.

Also applies to: 92-105, 186-189

test-integration/schedulecommit/client/src/schedule_commit_context.rs (1)

66-158: LGTM! User seed integration is sound.

The user_seed parameter is correctly threaded through constructors and stored in the context. PDA derivation at lines 115-118 uses [user_seed, payer_ephem.pubkey()], which will match on-chain derivation as long as callers pass the correct seed (b"magic_schedule_commit" or b"order_book"). The validation at lines 208-210 properly rejects unsupported seeds with a clear error message.

test-integration/programs/schedulecommit/src/api.rs (2)

36-54: LGTM! New order book instruction builders are well-structured.

The new instruction constructors (init_order_book_instruction, grow_order_book_instruction, update_order_book_instruction, schedule_commit_diff_instruction_for_order_book) correctly set up account metas and instruction data. The PDA derivation and account ordering align with the corresponding handlers in lib.rs.

Also applies to: 56-75, 175-212

---

100-142: Verify caller responsibility for seed correctness.

The function derives the PDA using the provided user_seed (lines 106-109) and then branches instruction construction based on that seed (lines 126-139). This design assumes callers will pass the correct seed that matches the on-chain program's expectations.

Ensure that:

• Callers always pass b"magic_schedule_commit" for MainAccount PDAs
• Callers always pass b"order_book" for OrderBook PDAs
• Passing an incorrect seed will result in a PDA mismatch and instruction failure

Consider adding a doc comment warning callers about this responsibility:

/// # Important
/// `user_seed` must match the on-chain PDA derivation:
/// - Use `b"magic_schedule_commit"` for MainAccount delegation
/// - Use `b"order_book"` for OrderBook delegation
/// Incorrect seeds will cause instruction execution to fail with PDA mismatch errors.
pub fn delegate_account_cpi_instruction(
    payer: Pubkey,
    player_or_book_manager: Pubkey,
    user_seed: &[u8],
) -> Instruction {

test-integration/programs/schedulecommit/src/lib.rs (2)

276-307: Verify that account header is properly initialized.

The allocate_account_and_assign_owner call (lines 298-304) allocates space but doesn't explicitly zero-initialize the header. Past review comments flagged this as critical, marked as addressed. Please confirm that either:

1. The allocation guarantees zero-initialized memory, or
2. A subsequent commit explicitly initializes bids_len and asks_len to zero

Without initialization, subsequent reads of the header in OrderBook::new() may encounter garbage values.

If initialization is missing, add it immediately after allocation:

allocate_account_and_assign_owner(AllocateAndAssignAccountArgs {
    // ... existing args
})?;

// Initialize header to zero
let mut data = order_book.try_borrow_mut_data()?;
if data.len() < std::mem::size_of::<OrderBookHeader>() {
    return Err(ProgramError::AccountDataTooSmall);
}
// Zero the header
data[..std::mem::size_of::<OrderBookHeader>()].fill(0);

---

356-389: LGTM! Order book delegation and commit handlers are correct.

The process_delegate_order_book (lines 356-389) and process_schedulecommit_for_orderbook (lines 415-435) handlers properly validate signers, construct delegate accounts, and invoke the appropriate CPI functions. The seeds match the PDA derivation in the init handler.

Also applies to: 415-435

Reviewing files that changed from the base of the PR and between db80cab and dcaafd1.

• magicblock-committor-service/src/tasks/mod.rs (10 hunks)
• test-integration/test-committor-service/tests/test_delivery_preparator.rs (4 hunks)

• GitHub Check: Build Project
• GitHub Check: run_make_ci_lint
• GitHub Check: run_make_ci_test

test-integration/test-committor-service/tests/test_delivery_preparator.rs (4)

18-20: LGTM! Clear documentation of runtime requirement.

The TODO comment properly explains the necessity for multi-threaded test execution due to blocking RpcClient calls in CommitTask::new(). The change is well-justified and aligns with the PR objectives.

---

83-85: LGTM! Consistent with multi-threaded runtime requirement.

The TODO comment and multi-threaded test attribute are consistent with the blocking RpcClient issue documented in PR #575. The test creates large buffers (10KB, 500KB) that trigger the threshold requiring RPC prefetch.

---

164-164: Correctly remains single-threaded.

This test appropriately uses the standard #[tokio::test] attribute since it only creates small data (10, 20, 30 bytes), which is well below the COMMIT_STATE_SIZE_THRESHOLD and won't trigger blocking RpcClient calls in CommitTask::new().

---

215-217: LGTM! Consistent multi-threaded runtime configuration.

Both TODO comments and test attribute changes are appropriate and consistent with the pattern established throughout the file. The tests create large buffers (10KB+ and 12KB/64KB respectively) that exceed the threshold and require blocking RPC calls.

Also applies to: 299-301